Stichworte: solve conflicts